removed a few un-needed lines