Remove unused code, improve existing code.