removed a bunch of crap, the rest will be removed after the redesign