more cleanup
fix analyzer warning