Dead Code fix