General cleanup - rename a few things, delete dead code.