cleanup and added signal key into conversations