remove image module dependency, fix _ reference