onBeforeRemove event added