Updated core and forms metadata packages to not include duplicates from provider classes