removed a bunch of non needed