INT-3309 More Polish; PR Comments

Also fix removeHeader in MMB.