Cleaned up workspaces