Remove unused symbols, rename a couple others for clarity