removed unused import
added missing import
removed unused import
removed unused import again
Merge pull request #3648 from monsta/patch-1

small fixes