Remove partial waterfall concept
1.0.1