Remove dependency on ImageX modules