remove EventConnect. code clean up