remove lazy imports