Cleaning up more shit