This code will go away soon, but it's good practice to leave it
in a clean state.