removing some redundant classes.
Authored by: pieterfourie 2014-10-16
Parent: [r30607]
Child: [r30609]