Removed unused code after refactor.