Removed code that went dead after changes in commit 171e1596

* PreHandler FSM changed in the above commit which killed some of
  the checks and code there.  I should have recognized that and
  cleaned up back then .. but better late than never.

Change-Id: I1fbd820db1a6b1e079d255bd13b4970865128dcf