Removed more references to deprecated stuff.