Cleanup specs for clarity