Remove  second copy of code