dismiss bugfix // pingallowed // cleanup

Change-Id: I9730eb0dd82069173f0d00a61ccf3ac4cb2341a1