Removed non-needed trims

I'll sleep easier at night knowing we're not trimming integer fields. And pretty sure we don't need to trim the extensions either (because why would there be spaces on an extension?)

Should properly address #480