Clean up workspace - Part 2