Some final clean up work.