Revert "More MVVM like code for Curve viewmodel"

This reverts commit 612a424ac2739c7fdc7b744ceb5ba7b89fad4902.