Removed unnecessary model and spec exception