Remove trailing semicolon as well
Cleanup plural equation on migration