Clean up obsolete functions

These are no longer necessary, or the functionality if covered by other
functions.