Remove some var and ListBuffer.