remove dependency on Spring from core modules