Remove auditing. Refactoring.