workspace: remove more dead code