Better singletons
removed unused files