ENH Clean up. Schedule