SWC-1835: cleaning up code related to before certified user lockdown date