Removed unnecessary variabels