remove unused import
upgrade sample app