Remove unneccessary code