Remove duplicates

Too much work keeping track of 2 languages in 3 files one of
which has 2 modes, resulting in a total of 8 duplicates.
Whitespace cleanup