Removed redundand code from DI Tools