Removed custom model store; modify WRs instead.