no more redundant imports in models