removed a load of crap