Slight code cleanup
Removed unused classes and imports
Reset homes functions