simplify workflow and partial remove of request