Removing warnings and deprecations.