MEM-11930 MEM-11584 removing tonyjohnson per heather's request