2nd pass on AVR file clean-up