refactored to remove some code

-- also removed the tie test data, because
   I realized it would never happen in real life.