removed Event dependency