fix clear to leave lock and exceptions in place