Remove base references