SpringCleanup

Spring Cleanup