Removed unused variables ws