Remove prefix in yaml, add policy check to block future usages (and minor cleanups)

Remove prefix in yaml, add policy check to block future usages (and minor cleanups) #2516