removal of more needless vars