Workspace and library cleanup