class mapper cleanup post-refactoring

Signed-off-by: gburgett <gordon.burgett@gmail.com>