Remove comments which don't match code and put something better in place :)