removed a lot of crap