Removed old magic