Clean up the deprecated warnings