Cleaning up unecessary code