Trimming dead code.. Part of #1400.
Slimming down util.php. See #1400