Fix proxying images, hopefully speed improvements from hashcode
Remove unused class