cleanup warnings
fix unused condition
@rev goliver@
Merging origin/gtorres/master-pending-unusedcondition into master