removed unessecary code