More debugging switches for APP
Removed junk