Remove image wrapper.

Fixes #701