Clean up implementation of BaseContainer and BasePresenter.