Remove warnings and deprecations