Remove unneeded trim code that was messing with #prefix/#suffix etc.