Removed obsolote refactoring of previous DIP