Refactoring / removing dead code.