Stop exporting, and stop using, functions marked as deprecated