Remove redundant logs, use correct context
Bugfixes