Removed some legacy Windows 8 code