Remove unused code and fix name.