Cleanup: no demo mode, no extra tasks