A lot of legacy commented code has been removed.