Add option to remove event and few other fixes