HomeController cleanup

JIRA:
CG-85