Removed some dead and unused code.