Fix build, and Remove SMI.

Change-Id: Ie779aaf139b148d2b4918fd34ec5bab11ebedd8f