removed unneccessary code