Fix remove and edit
Make catalog profile agnostic