#36 Finished deprecation of images