rm entries completely.

Incremental towards #882.