mango: little cleanup

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I599eb8e31f8f79a868002a6cd0b90718e2d8d029