JSON API cleanup