DSP-1954 clean the code