mint: cleanup to align with fusion3 cleanups

Change-Id: Ieca53b4cf0517e93e7487604cf3f1d13696f91ee