CB-6859 Removed all wp7 references, tests still passing