remove direct import from safe package #545