Remove some #ifdef'd out code which was inadvertantly introduced in our
initial merge.
Signed-off-by: NMark Fasheh <mark.fasheh@oracle.com>