Remove comment, fix schema