Merge "Cleaning AAI client after refactor"