Order imports.
Clean up.

Removed unused code
Release as version 1.0.2
Fix a sample app