removed uncessary checks