cleanup some mis-named things and remove dead var