Clean up options & one spec