MP-137 #comment remove cruft