Deleted some dead and duplicative code.