removing the unneccessary code