Cleaning no more used duplicated code