cleaning up some names and dead code