removed unused variabels