major update to housekeeper, cleanup old code