-Code tidying up: unused comments removed, warnings surpressed, unused
methods,... .