Add option to clean up workspace