Remove import * in modeling