Upgraded to Newtonsoft.Json 5.0.8 and Code Cleanup