Remove deprecated extends