Cleaning up AEFCLient completion/error handling