Revert "Add trim to mean/sd"

This reverts commit cf1264f232141ac8e776e753352f7152628e9236.