More Workspace Cleanup