More arrays and removed dead code.