Removal of Bravo dependancies