Begin cleanup by commenting unused methods
Authored by: jmbailey 2015-04-14
Parent: [r4770]
Child: [r4772]