removed not needed end events