Removed some unused modules, and defer loading others
Removed some unused modules, and defer loading others