Cleaned up unecessary code