Remove old testing code - clean out ready for ld30.