Remove sanity checks
Fix deprecation warnings