Fixed model checks

Removed unused imports