[ModernApp] Cleaningup Debugging