cleanup and update version