Minor cleanup and removed dead code.