Refactoring, removing uncessary interfaces.