Clean up specs based on PR feedback