mint: fw cleanup

Change-Id: If93dc98b1b14037804cc0ed98be679d7317cffcd