Remove unused module
Refactor main controller