Clean up case-1

Moved from nouns-in-case-1