Removed invalid references from Demo scheme