Simplify

Simplify sample app