remove notify messages and fixed a minor deadlock issue