Further removal of references to demos in code