Removed obsolete file
Added events