removing more uncessary code