oops, fix name collisions, and remove some dead code