Refactor - Further remove unused code.