Clear out code that we shouldn't be using any more.