Cleaned Auton code