Removed some more unneeded unsafe stuff