Cleaning up unneccessary code