fix removal on delete
fix identifier