cleanup; branch was for a review done a while ago
Authored by: cwilper 2010-12-10
Parent: [r8855]
Child: [r8857]