Cleanup and “demos” menu