Remove duplicate TOP insertions, drop unused defs.
Merge pull request #532 from wtlangford/top-removal

Remove duplicate TOP insertions, drop unused defs.