Upgrade to 4.2 build 2, Source code modifications, Code cleanup, smaller size