@shacker Can we at least remove all the things that are injected here?
If we don't need the function() we should probably remove that as well