Remove cruft carried over OTM1. Fixes #240.