MBS-5625: remove a bunch of [%%]