add logging
remove context logger