bacon: cleanup

Change-Id: I2dfb58b28cbcc8adf11b7f58ea6fdf0fbdacd435