more cleanup from the accidental bundle checkin