Prevent potential crash; remove unused import