XD-2197 clean up per MF comments