remove model code from parser level
12 files changed