And remove the builder from the creative tab

Complete the last commit
(#6653aaa3893da023f350a48bb6fddeba3008e2e9)