Cleanup and bring up to date.