PTFM-11133 Additional cleanups following 79b830a5.