Clean-up. Continued preparing for wp7 port.