Remove some dead code, update docs