Remove redundant args, fix deprecation warnings