cleaned imports in all classes except shop