Removes the model requirement. Fixes specs.