Remove some legacy crud, and add some comments