packdepth cleanups