More Workspace cleanups