Cleanup singleton mess