Removing trim() calls