Refactor.
Remove unused code.
Remove unused method.