PMO-2198: code cleaning up