Refactor static methods in singletons which change the state of the object to be non-static and be called via `getInstance()`.
Refactor static methods in singletons which change the state of the object to be non-static and be called via
getInstance().