Turns out we do need ImageDataImage. Put it back and clean up the code