renamed old var; removed bad codez