Cleanups to reduce noise of mess detector.