Remove transitional functions.