Remove the generic extension support