drop case classes, not adding a lot
help cleanup