Remove global context again, replace with Handler Interface.