Merge "Remove some unused methods and fields in wm" into main