remove Singletons, try to serialize typeset directly