Removed old modules, some changes to settings