Schema response minor clean up