Still cleaning up os_apps and schedules