Removed unnecessary code.

Fixing old incorrect stuff.