cleanup after last changes