Cleaned up the mess in Home