Fix and remove editor