Removed legacy code, support for images in