Fixed removal of identifer and publication event