Cleanup IEntityManagerHelper and related stuff

This is a high risk cleanup, so, I have also started a full run of tests.
Can I fix this in my next pull request ? I this is a big pull request and want to avoid rebasing.