removed some more unused mfp code (nw)