Fixed override removal