Remove work package model composition

~~**NOTE: Includes commits from #1634** (please review/merge first)~~