removed a couple of things