Remove GSA from extend_*