encodeQP: cleanup
TComDataCU: cleanup
Merge