CLSN-2149 : remove billing compilation issues