Add clear() to few more places