Fixes for the remove notification and a change to logging.