code cleanup, removed some "TODO Auto-generated ..."-markers to get a better view on the relevant TODOs.
Authored by: mrieser 2010-05-06
Parent: [r11422]
Child: [r11424]