cleanup, remove lots of crap