guard cleanups