Merge "Code cleanup. Removing unwanted old code with references to home"