Nightcharts: Cleanup