Cleanup specs with wording changes and removal of unnecessary contexts