SPring Cleanups