Remove compatibility support