CON-2282 Clearing out duplicated margin