Removed a little unnecessary code