optimize imports
simplify
replace bazaar command by generic file command