Remove unnecessary modules
Refactor