Inspection cleanups