last changes before deleting Rubber