haida: little cleanup

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

Change-Id: I18f6b72dc6af5ad4f74422e2d2001cf8fb789530
Fix build

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