Make demo more simpler
Fix demo includes path
Remove unused