Get rid of @default