MOB-711 Cleaning up