Completed q3 and cleaned up q2 messages