removed bunch of stuff