Merge "AaiController cleanup"