Sample pipeline cleanup and fixes for dirs handling