Last of the commented code removal

@corranwebster: I think this takes care of the last of the commented which you modified as part of #139.