begin cleaning up code related to before certified user lockdown date
Merge pull request #1329 from jay-hodgson/SWC-1835

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