Refactoring of some JSONS

Are there any more jbuilders we should get rid of?