Clean up model urls and json