Removed old out-commented code.