those were needed because of some odd mpp behavior that seems to have
been fixed.

Makes the code cleaner.
Signed-off-by: wm4 <nfxjfg@googlemail.com>