Merge "Bouncer cleanup"