Remove cruft

It was just in the way while reading recent SurfaceImage patches.