[Refactor] Removed end_* related methods