More cleanup of the workspace