Terrain and miscellaneous cleanup