spring cleanups