Removed more superfluous code.