Removed more useless code.