Clean up a couple really old functions