Fix and remove