Remove compatibility stuff from the core