closure base cleanup