diff --git a/builder/main.py b/builder/main.py
index fa32383..0a9fbda 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -259,9 +259,6 @@ def get_esptoolpy_reset_flags(resetmethod):
         env.VerboseAction(
             lambda source, target, env: _update_max_upload_size(env),
             "Retrieving maximum program size $SOURCE"))
-# remove after PIO Core 3.6 release
-elif set(["checkprogsize", "upload"]) & set(COMMAND_LINE_TARGETS):
-    _update_max_upload_size(env)
 
 #
 # Target: Print binary size