Eliminate dead code

Remove dead code from workspace data structure change.