Removed unneccessary checks