clean up comments in sample app
remove unused imports
update sample app settings for development branch