refactor(core)!: clean-up core and simplify preblock (#19672)

refactor(core)!: clean-up core and simplify preblock (#19672) #4