More cleanup and notice showing