move to private method
remove useless model class