some clearing fixes