bravo: clean up

Change-Id: Ia7f9464aff9b3d15b88eacffffa7343a445ace46