Remove supermodel and with_model dependancies.

Remove out of date dependancies and isolate adapter test requirements.