Fixing up mistake
Removing excessive code in sample