removing some apparent no-ops