Cleaned up unecessary code.