Cleaned up singletons