Cleanup after merge
Remove deprecation warnings