Fix up image support, remote un-needed images