PLA-833 remove not needed event handling