Optimize startup
Remove muse
Refactoring