minor tweak cleanup and pruning