Updating before removing dupliced code