[Tech debt] remove TODOs from main

[TheAndrewJackson]

Description & Solution

Some TODOs have made it into main. It would be helpful to remove them and add each one as a separate Github issue. This will help make them more discoverable and trackable.