cleaned up and removed a bunch of shit