Killed duplicate code