Cleaned up Spring dependencies and updated Spring version to 3.0.7