encapsulation cleanup