Remove comment boxes. See #446