Status, minor cleanup for upgrade work.