Cleanup, and started to migrate filler / quarry to the new bpt
close #1488