remove dependency on ApplicationContext