Revert "Introduction of TwoPart model"

This reverts commit 7bfd630823df7d102232b3ea63b9df2678ce5907.