Remove some dead code
Beef up test coverage