Remove compatibility layers