Cleanup and updates.