Add clear() to few more places
Merge pull request #1156 from igorko/master

Add clear() to few more places
Merge remote-tracking branch 'upstream/master'