Remove Dependency on Spring Framework