remove some push_external calls