#43 issue: Clean up of legacy code. MLN parsing.(2)