removed all the old singletons that are now merged into the new classes