Get rid of stuff that belongs only in wmplus branch