build: cleanup of unneccessary build block
build: delegated build cleanup