removing two more deprecated annotations
Authored by: vsp_nagel 2014-12-22
Parent: [r31598]
Child: [r31600]