Fixed workspace cleaning