Removed unneeded unsafe part