Callflow cleanup