Update Comments

Update Comments
Remove Demo Class

Remove Demo Class