Code cleanup/removed use of simplejson.

Removed some commented out code, changed the use of the simplejson module
to the json module, and simplified some json responses.