The direct manipulation gizmo should be removed from DataStorage when manipulated object is removed. Currently it is not. This might seem strange to users.
The problem can be solved by adding a small observing object that will do exactly the removal that is needed.