[Refactoring] Moved methods removed.