remove a bunch of stuff for now