Naming and removed dead code.