Some final cleanup.