refactoring : remove code not used anymore