I know it's auto-generated, but can we get rid of these?