warning fixes

get rid of pointless extra variables too