removed unessesary code