- Cleaned up AVR.