Improve cleanup of Singletons

There are some weird crashes related to destroying static objects. Add some functions to make it easier to make sure that the singleton objects are cleared and cleaned up.