We remove the catalog patches / solve 4.3 compat