Tidy up
Do not place UndoManager on API object