Remove safety check, as we'll need it