renamed model and removed unused imports