#1191 un-needed variable removal