I removed some more useless code.