Remove encapsulation that isn't needed