Merchant SDK: refactoring and cleanup post config update