Remove dmodel dependency