Remove unnecesaries
Merge pull request #2278 from tricknotes/remove-unnecessaries

Remove unnecesaries