= core: minor cleanup before release