Removed old retro-compatibility markup