Commented out duplicate code