Revert "Implement client/server Util.trim"

This reverts commit 3e196fb3d47c9328bc493ac446cd172f3768ce27.