Remove unused APM code
Allow Advanced Config for all firmware types
Merge pull request #917 from DonLakeFlyer/APMCleanup

Apm cleanup