[#48704181] remove/merge the remaining functional specs