Remove comments about copied code, refactored the copied code out