partially automated cleanups (commit: 9382274)
1.2.2 (commit: e02dfa4)
update for 1.16.5 nms change that was missed (commit: 320ae39)