[fix] Remove remaining dependencies to helpers