static analyzer warnings removed