MFC r257115, r257116, r257117

 Remove dead and duplicated code.