Merge branch '648-SBA-cleanup' into 'main'

Removing comments and code that are/is no longer needed for SBA

See merge request !920