Spring Cleanup

    Service Spring Cleanup