CLSN-1926 code review : from 26-Oct to 9-Nov
14. move commented code at the bottom.