7 Years Ago
More cleanup/refactoring of manager singleton stuff