Fix minor typos and remove duplicate include

Authored by yurchor on Dec 29 2019, 12:16 PM.