Cleanup, specs [ci skip]