Removed some no-longer-needed code.