Removed dead code.
Finished .avnrc tests.