Clean up dependencies to Spring