Pruned and renamed some utilities.