Removed unused variables from previous versions