Removed some obsolete bits of code.