removed some stuff
removed more stuff