improve startup time, and some cleaning