cleanup and simplification of third declension