PRD-4408: Some cleanup of this class (remove static references) to support reuse of code for ct panels.