killed duplicate code