Cleanup of Model_House. More needed.... :-(