Removing unnecessary backwards compatibility