Remove some unused/unnecessary Util classes

+7/-1634 is the best I've had in a while.
What is tap?