Remove unneeded defaults and checks.