Remove trim...safely

That's close to what I did...no problem:D