Removing dead code
Removing dead test harness