removed old event code, some cleanup