Cleaning up and deleting a bunch of crap; simplifying