cleaning after merge with JM