Remove safety function wrapper