Cleanup of save controller code from old json format