Improve workspace cleaning