Remove duplicated 'none' and minor adjusts
Merge pull request #2605 from Sinza-/split-fix

Remove duplicated 'none' and minor adjusts