refactor: extract remove.. methods (consistency)