remove a lot of XXX::onDestroy()