Mismatch conflict comments from merge changes left invalid code.  Cleared references no longer used.