Merge "Remove support for image classes"