Get rid of Shim: nothing uses it, it just bitrots.

Issue #480 relevant.