More clean up now that we know that it works.