Prep for adding a schedule-backup rest method + client cleanup