Update for use with Wavetronix

For some reason, my previous changes were lost. I guess I didn’t commit
them or something.…
Merge branch 'ap-remove-unneeded-files'