CPEUI-20102: It’s working but still clean up to do.

I’ll never get time to do that “clean up”