more cleanup for first dist