New version; remove unsafe functions by default