Removing unused injected dependencies in various modules...