Cleaned up BlockPipe