Remove DataValueFactory
Remove dead class refs