Removing supermodel and with_model