Remove old merchant code