Add clearSingleton