Updated files to latest framework version.
Code cleanup.