Fix spec
Cleanup