Cleaned up commented out statements and diagnostic output.
Authored by: guidrymw 2012-09-18
Parent: [r50]
Child: [r52]