haida: little cleanup

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

Change-Id: I18f6b72dc6af5ad4f74422e2d2001cf8fb789530