Merge "Remove old blocklist code, prepare for changes" into main