Removed some Surface SDK references, ensured it works on the lab machines.