removed uncessary code