[PATCH] Deploaybles and catalog_entries cleanups