Removed  and  dependencies on home controller