Version bump and cleanup

Created by  pmeunier  on February 25, 2021
G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC
Change contents