removes wp7 code + minor clean up