Cleanup, fixed dismissing not working most of the time.