Removing useless logging
Fixing broken contexts