Bug fix for context processors. Cleanup