Minor - format code, removing unused commented code.
Fixing session course order see BT#8316