[TIMOB-12431]Moving more logic to AppDefaults and reducing code clutter.