some refactoring, add delete unused currency pair