removed old context setting