Merge "base: remove extra checks"