Fix remove composition