[BUG #8618] fixed cleanup
minor