More cleanup of workspace