Remove more BeanStalk

Change-Id: I1633c165a9455db44f009bf01a1ecc8a1d876736