Clean-up and Finalize for 1.7.2, possibly 1.7.10