DEFINE clean up in Cityscape classes