refactored ADSal is compilable
ADSal: cmmented out code is removed