Bump versions + cleaning