Yes, I agree. That code needs to change in any case, I'll clean it up once I get to completely eliminate that singleton.