Quick cleanups