[#155] Remove duplicated code

* The duplication seems to have happened in a conflict solving