Also remove the unnecessary XInitialization implementations.

Change-Id: I81f32b2cdcf69b84fe4b15382f9294073a7f2f20