Remove warnings, including deprecations