These should all have been deprecated for at least one cycle, so this commit
cleans them all out.