Removed old warning-only code