removed a few unnecessary things