Remove JSON stuff for now