Clean up specs [#86776]