#55 #2 Less aggressive cleanup of the intent