Workspace Cleanup

Ws cleanup