Remove explicit overrides for app controlled modules