Improved model speed, cleaned up unnecessary imports