Got rid of unused veriables