Pruned some old, no longer necessary code.