added QED as supported image format and cleaned up

Change-Id: Ib5c8b28c2c9273e7f80d7e15b45bdfb7e06d4560
Merge "added QED as supported image format and cleaned up"