remove dataModel. and refactor some class.