removed book-keeper reference
updated enrichment fac to use new Event manager instead of tables