Refactor and cleanup of all payment gateway pathway support.