Found more old code - this ready for deletion altogether