Removed some unused modules, and defer loading others