Remove obselete deduction ruleform.  Refactor packages to reduce
clutter.  Clean up