Yank out some deprecated API