Final cleanup before investigating Context pattern