MB-135 #fixed delete logic