Removed some db lookups during event notification