General Updates

Updated tools to remove extraneous schema requirements