Remove this check