Removed unnessasary unsafe in extern methods.
Merge branch 'rm-unsafe' into working