bacon: clean up

Change-Id: If8149d0d9198d0d57292ec44a641ec47f3f6798b