Remove unneeded trim code that was messing with #prefix/#suffix etc.
Merge pull request #19 from jordandukart/7.x

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