Merge "Remove deprecated image defines"