removed a few un-needed things