Removed old_… helpers