puma removed, nil checked in update_messages