Remove depricated options