Clean up unecessary code