Remove WideImage dependency