Merge "Remove some unused fields and methods in WM"