Remove unneded code
Refactor: extracted code