Remove dead code in Windows 8 action plus some additional UT