Fix accidental bitwise operator
Remove unused variables