removing uncessary code