Removed unused veriables left over form merge