Cleanup a couple of old functions on the block