Cleaned up conversation manager more