Removing unnecessary judgment