Remove the old original code that we're no longer using