Cleanup plurals and tcap