nick cleanups