blue: cleanup to switch to fusion3 way

Change-Id: I238628384d152dbe6ff67fcd55207f40eb57e9b9