removed a bunch of shit