Cleaned up house gen