cleanup post I18