removed a bit of unecessary code