Remove usage of Spring context