Kill 1.22wmfXX remnants

Change-Id: I03acfdec0bdc094ad1e1a02a83462ef1df6cf455