major cleanup and pickups