Fix excess HSA contribution, I am from California with a tax deadline of October 16, 2023

Hi, I read the posting saying to fix the issue by the Tax date; now California's tax due day is October 16, does it mean I can fix the issue by October 16?