Cleaning up a bunch of shit