Revert "feature/pipelayer"

This reverts commit 95ae420760737386bd5b2c8be4ba9a2e25a4d45a.