Remove comment support