Stop using deprecated event methods