remove artefacts from old refactorings
Authored by: thibautd 2014-04-22
Parent: [r28765]
Child: [r28767]