Remove redundant safe/unsafe functions