Remove cruft

**Resolves issue #383, among other things.**