Removed unused code
Added event source shim