mach-msm: bravo: cleanup