removed bunch of things