cleaned up JSON related code

removed what I think is unnecessary..