Home task 5-6-7 cleanup

unused & obsolete method s removed
code clean up (formatting)