[Refactoring] Removed some unused code.