Refactoring : removed unused references