16052014 cleanup for sample