Code cleanup. Removing unwanted old code with references to home

Test: Manual
Bug: 159167834
Change-Id: I6fa6b2dac3fbbef534e0b2d1ba36f230a35b5e7a
(cherry picked from commit 11d99b610fcbf12821d5593363bd641833b7f717)
(cherry picked from commit d03bf880349658fc913baba447fb35e1616a6e38)
3 files changed