Static import cleanup to remove deprecation warnings