Feature/convo cleanup