In the next PR they are gone and the module is converted into a feature that handles this.