code cleanup, removing commented out code, adding missing annotations.
Authored by: mrieser 2010-05-26
Parent: [r11619]
Child: [r11621]