Cleanup of json mab schema.  TODO: further breakdown / modularization