Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00' * commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00': SIP: clean up unused class and fields.
Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00' * commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00': SIP: clean up unused class and fields.