spc476 Finally remove the marked "remove me" functions.