o Code simplifications and refactoring:
    - Remove a bunch of unused function declarations as well as a block of
      #if 0'd code from the unit tests. Closes bug 1824.