cleanup before release 1.8.3