More cleanups, removing dead code.
Unimod no longer needed.