Some changes to remove still not fixed