Remove more JSON stuff