Remove some old, untested functions.