* fixed potential circular dependency problem by removing unnecessary import