Fix duplicate reported by lat9

Fix duplicate reported by lat9
(other file cleanups will occur when PR #121 is merged, after outstanding updates are completed to it)