removed old event handler methods and fixed dependencies