Removed trim shim, and replaced it with regex trim