blue: old header cleanup

Change-Id: Ic0eb17683d4dcf137f464e097f36bab2f72ad61b