Cleaning up some night stuff