Remove duplicate TOP insertions, drop unused defs.

@nicowilliams Here's the TOP fix I'd mentioned.