remove some safe methods because of the new makeSafe method usage