Cleanup last changes