Spring CleanUp