Finish removal of APM mode selection
Added missing newline
Merge pull request #855 from DonLakeFlyer/APMSelectFix

Finish removal of APM mode selection