ditch some useless checks