Remove API specific things for older APIs