Remove GP and fix AID class.