3 nov: remove duplicated code