Remove empty(not needed) modules
Start working on main