Remove unused import
Allow override injectable in parent scope.
Fix the singleton function injection