Event: remove unused code