Remove old mock helper code to prepare for real helper code