Slimmed some modules for quicker startup