Fix a crash in noncestore and remove an unneeded import